(calc-get-register): Fix problem when the Calc register is empty.

diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index e1e83abe70cb9207c245ff7dee67f9f3f3a6a829..65bec46db8e90c21510546e37b837f3d0d598181 100644 (file)
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -156,9 +156,9 @@ in which case either return the contents of the Emacs register (if it is
 text) or `nil'."
   (let ((cval (cdr (assq reg calc-register-alist)))
         (val (cdr (assq reg register-alist))))
-    (if (and (stringp (car cval))
-             (stringp val))
-        (if (string= (car cval) val)
+    (if (stringp val)
+        (if (and (stringp (car cval))
+                 (string= (car cval) val))
             (cdr cval)
           val))))